Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 18:48:49 +0000 (11:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 16 Aug 2011 18:48:49 +0000 (11:48 -0700)
commit527054f6ba647e4626d4bf6c71ca3e13e133da2c
treebd59167c7a9e37bbe93277acdacc05591fb73b0c
parent02a58b029d361576285a98cd88a72fba6410471f
parent470b3b9a63d568c76154eb485d7fee46876ef4a3
Merge from trunk.
src/ChangeLog
src/xdisp.c